Auto merge of #4276 - alexcrichton:revert2, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 13 Jul 2017 04:19:23 +0000 (04:19 +0000)
committerbors <bors@rust-lang.org>
Thu, 13 Jul 2017 04:19:23 +0000 (04:19 +0000)
commite7a185b073cab5cd4dd121dcf2fc6e6a4ad17e61
treee7f34efb671d925f81b552617f60c246ddfe0883
parentbff2d2a2024ab6b5016b791b47500de550e1a41d
parent931aec1d4af118599c7d0b624a72b9caf4671b7d
Auto merge of #4276 - alexcrichton:revert2, r=alexcrichton

[beta] Don't set MAKEFLAGS for build scripts

Closes #4156
Closes rust-lang/rust#42635